bitkeeper revision 1.1705 (42a8a185wutSw6hue95Thw_5_jDPZw)

Xenstore build fixes for x86/64.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index cd4a7b307947fbdb2390870710180243871439e3..b5511aea3cfc9e578fd8c04c91efa849ac24b56a 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -1,6 +1,5 @@
 XEN_ROOT=../..
-# This does something wrong to TARGET_ARCH.
-#include $(XEN_ROOT)/tools/Rules.mk
+include $(XEN_ROOT)/tools/Rules.mk
 LIBDIR = lib
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 
@@ -20,7 +19,10 @@ BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
 BASECFLAGS+= -I$(XEN_ROOT)/xen/include/public
 BASECFLAGS+= -I.
 
-CFLAGS+=$(BASECFLAGS)
+CFLAGS += $(BASECFLAGS)
+ifeq ($(XEN_TARGET_ARCH),x86_64)
+CFLAGS += -fPIC
+endif
 LDFLAGS=$(PROFILE) -L$(XEN_LIBXC)
 TESTDIR=`pwd`/testsuite/tmp
 TESTFLAGS=-DTESTING